Use common marshalling routines instead of having widget-private ones.
It compiles & links.
testgtk segfaults. I'm convinced that is Somebody Else's Problem
(marshalling routine gets func_data=0x0 and blithely passes it on) but the
fact that it happens now & not before makes me wrong :-)
"BOXED"=>"gpointer", "FOREIGN"=>"gpointer",
"CALLBACK"=>"gpointer", "POINTER"=>"gpointer",
"ARGS"=>"gpointer", "SIGNAL"=>"gpointer",
- "C_CALLBACK"=>"gpointer", "OBJECT"=>"gpointer");
+ "C_CALLBACK"=>"gpointer", "OBJECT"=>"gpointer",
+ "STYLE"=>"gpointer", "GDK_EVENT"=>"gpointer");
-open(IL, "<".$ENV{'srcdir'}."/gtkmarshal.list") || die("Open failed: $!");
-open(OH, "|indent >".$ENV{'srcdir'}."/gtkmarshal.h") || die("Open failed: $!");
-open(OS, "|indent >".$ENV{'srcdir'}."/gtkmarshal.c") || die("Open failed: $!");
+$srcdir = $ENV{'srcdir'} || '.';
+
+open(IL, "<$srcdir/gtkmarshal.list") || die("Open failed: $!");
+open(OH, "|indent > $srcdir/gtkmarshal.h") || die("Open failed: $!");
+open(OS, "|indent > $srcdir/gtkmarshal.c") || die("Open failed: $!");
print OH <<EOT;
#ifndef __GTKMARSHAL_H__
#define __GTKMARSHAL_H__ 1
-#include "gtktypeutils.h"
-#include "gtkobject.h"
+#include <gtk/gtktypeutils.h>
+#include <gtk/gtkobject.h>
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE
EOT
@params = split(/\s*,\s*/, $paramlist);
my $funcname = $retval."__".join("_",@params);
+ my $defname;
next if (exists $defs{$funcname});
$doequiv = 0;
for (@params, $retval) {
- if ($trans{$_} eq "gpointer") {
+ if ($trans{$_} eq "gpointer" && $_ ne "POINTER") {
$doequiv = 1;
last;
- }
+ }
+ if($_ eq "ENUM" || $_ eq "UINT" || $_ eq "ULONG") {
+ $doequiv = 1;
+ last;
+ }
}
# Translate all function pointers to gpointer
- $defname = "";
+ $defname = $funcname;
if($doequiv) {
print OH "#define gtk_marshal_$funcname ";
$defs{$defname} = 1;
for (@params, $retval) {
- if ($trans{$_} eq "gpointer") {
- $_ = "POINTER";
- }
+ if ($trans{$_} eq "gpointer") {
+ $_ = "POINTER";
+ }
+ if($_ eq "ENUM") {
+ $_ = "UINT";
+ }
+ if($_ eq "UINT") {
+ $_ = "INT"; # Unvalidated assumption - please check
+ }
+ if($_ eq "ULONG") {
+ $_ = "LONG";
+ }
}
$funcname = $retval."__".join("_",@params);
- print OH "gtk_marshal_$funcname\n";
+ print OH "gtk_marshal_$funcname\n\n";
next if (exists $defs{$funcname});
}
$defs{$funcname} = 1;
print OS " func_data);\n}\n\n";
}
-print OH "#endif\n";
+print OH <<EOT;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __GTKMARSHAL_H__ */
+EOT
close(IL); close(OH); close(OS);
signal_flags,
class_type,
handler_offset,
- gtk_accel_group_marshal_add,
+ gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM,
GTK_TYPE_NONE, 5,
GTK_TYPE_UINT,
GTK_TYPE_ACCEL_GROUP,
signal_flags,
class_type,
handler_offset,
- gtk_accel_group_marshal_remove,
+ gtk_marshal_NONE__POINTER_UINT_UINT,
GTK_TYPE_NONE, 3,
GTK_TYPE_ACCEL_GROUP,
GTK_TYPE_UINT,
GTK_TYPE_GDK_MODIFIER_TYPE);
}
-void
-gtk_accel_group_marshal_add (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkSignalAddAccelerator signal_func;
-
- signal_func = (GtkSignalAddAccelerator) func;
-
- signal_func (object,
- GTK_VALUE_UINT (args[0]),
- GTK_VALUE_BOXED (args[1]),
- GTK_VALUE_UINT (args[2]),
- GTK_VALUE_UINT (args[3]),
- GTK_VALUE_ENUM (args[4]),
- func_data);
-}
-
-void
-gtk_accel_group_marshal_remove (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkSignalRemoveAccelerator signal_func;
-
- signal_func = (GtkSignalRemoveAccelerator) func;
-
- signal_func (object,
- GTK_VALUE_BOXED (args[0]),
- GTK_VALUE_UINT (args[1]),
- GTK_VALUE_UINT (args[2]),
- func_data);
-}
-
GSList*
gtk_accel_groups_from_object (GtkObject *object)
{
GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
object_class->type,
GTK_SIGNAL_OFFSET (GtkAdjustmentClass, changed),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
adjustment_signals[VALUE_CHANGED] =
gtk_signal_new ("value_changed",
GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
object_class->type,
GTK_SIGNAL_OFFSET (GtkAdjustmentClass, value_changed),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, adjustment_signals, LAST_SIGNAL);
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, pressed),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
button_signals[RELEASED] =
gtk_signal_new ("released",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, released),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
button_signals[CLICKED] =
gtk_signal_new ("clicked",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, clicked),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
button_signals[ENTER] =
gtk_signal_new ("enter",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, enter),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
button_signals[LEAVE] =
gtk_signal_new ("leave",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, leave),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, button_signals, LAST_SIGNAL);
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCheckMenuItemClass, toggled),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, check_menu_item_signals, LAST_SIGNAL);
gfloat position,
gboolean auto_start_selection);
-
-/* Signals */
-static void gtk_clist_marshal_signal_1 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-static void gtk_clist_marshal_signal_2 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-static void gtk_clist_marshal_signal_3 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-static void gtk_clist_marshal_signal_4 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-static void gtk_clist_marshal_signal_5 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-
-
/* Fill in data after widget is realized and has style */
static void add_style_data (GtkCList * clist);
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, select_row),
- gtk_clist_marshal_signal_1,
- GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
+ gtk_marshal_NONE__INT_INT_POINTER,
+ GTK_TYPE_NONE, 3,
+ GTK_TYPE_INT,
+ GTK_TYPE_INT,
+ GTK_TYPE_GDK_EVENT);
clist_signals[UNSELECT_ROW] =
gtk_signal_new ("unselect_row",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, unselect_row),
- gtk_clist_marshal_signal_1,
+ gtk_marshal_NONE__INT_INT_POINTER,
GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
clist_signals[CLICK_COLUMN] =
gtk_signal_new ("click_column",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, click_column),
- gtk_clist_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1, GTK_TYPE_INT);
clist_signals[TOGGLE_FOCUS_ROW] =
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, toggle_focus_row),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[SELECT_ALL] =
gtk_signal_new ("select_all",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, select_all),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[UNSELECT_ALL] =
gtk_signal_new ("unselect_all",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, unselect_all),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[UNDO_SELECTION] =
gtk_signal_new ("undo_selection",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, undo_selection),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[START_SELECTION] =
gtk_signal_new ("start_selection",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, start_selection),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[END_SELECTION] =
gtk_signal_new ("end_selection",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, end_selection),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[TOGGLE_ADD_MODE] =
gtk_signal_new ("toggle_add_mode",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, toggle_add_mode),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[EXTEND_SELECTION] =
gtk_signal_new ("extend_selection",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, extend_selection),
- gtk_clist_marshal_signal_5,
+ gtk_marshal_NONE__ENUM_FLOAT_BOOL,
GTK_TYPE_NONE, 3,
GTK_TYPE_ENUM, GTK_TYPE_FLOAT, GTK_TYPE_BOOL);
clist_signals[SCROLL_VERTICAL] =
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, scroll_vertical),
- gtk_clist_marshal_signal_4,
+ gtk_marshal_NONE__ENUM_FLOAT,
GTK_TYPE_NONE, 2, GTK_TYPE_ENUM, GTK_TYPE_FLOAT);
clist_signals[SCROLL_HORIZONTAL] =
gtk_signal_new ("scroll_horizontal",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, scroll_horizontal),
- gtk_clist_marshal_signal_4,
+ gtk_marshal_NONE__ENUM_FLOAT,
GTK_TYPE_NONE, 2, GTK_TYPE_ENUM, GTK_TYPE_FLOAT);
clist_signals[ABORT_COLUMN_RESIZE] =
gtk_signal_new ("abort_column_resize",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, abort_column_resize),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
*/
}
-static void
-gtk_clist_marshal_signal_1 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkCListSignal1 rfunc;
-
- rfunc = (GtkCListSignal1) func;
-
- (*rfunc) (object, GTK_VALUE_INT (args[0]),
- GTK_VALUE_INT (args[1]),
- GTK_VALUE_POINTER (args[2]),
- func_data);
-}
-
-static void
-gtk_clist_marshal_signal_2 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkCListSignal2 rfunc;
-
- rfunc = (GtkCListSignal2) func;
-
- (*rfunc) (object, func_data);
-}
-
-static void
-gtk_clist_marshal_signal_3 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkCListSignal3 rfunc;
-
- rfunc = (GtkCListSignal3) func;
-
- (*rfunc) (object, GTK_VALUE_INT (args[0]), func_data);
-}
-
-static void
-gtk_clist_marshal_signal_4 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkCListSignal4 rfunc;
-
- rfunc = (GtkCListSignal4) func;
-
- (*rfunc) (object, GTK_VALUE_INT (args[0]),
- GTK_VALUE_FLOAT (args[1]), func_data);
-}
-
-static void
-gtk_clist_marshal_signal_5 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkCListSignal5 rfunc;
-
- rfunc = (GtkCListSignal5) func;
-
- (*rfunc) (object, GTK_VALUE_INT (args[0]), GTK_VALUE_FLOAT (args[1]),
- GTK_VALUE_BOOL (args[2]), func_data);
-}
-
static void
gtk_clist_init (GtkCList * clist)
{
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkColorSelectionClass, color_changed),
- gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+ gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, color_selection_signals, LAST_SIGNAL);
guint seq_id;
};
-
-typedef void (*GtkContainerSignal1) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-typedef void (*GtkContainerSignal2) (GtkObject *object,
- GtkFunction arg1,
- gpointer arg2,
- gpointer data);
-typedef gint (*GtkContainerSignal3) (GtkObject *object,
- gint arg1,
- gpointer data);
-typedef gint (*GtkContainerSignal4) (GtkObject *object,
- gpointer data);
-
-
-static void gtk_container_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_container_marshal_signal_2 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_container_marshal_signal_3 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-
-
static void gtk_container_base_class_init (GtkContainerClass *klass);
static void gtk_container_class_init (GtkContainerClass *klass);
static void gtk_container_init (GtkContainer *container);
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkContainerClass, add),
- gtk_container_marshal_signal_1,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
container_signals[REMOVE] =
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkContainerClass, remove),
- gtk_container_marshal_signal_1,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
container_signals[CHECK_RESIZE] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkContainerClass, check_resize),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
container_signals[FOREACH] =
gtk_signal_new ("foreach",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkContainerClass, foreach),
- gtk_container_marshal_signal_2,
+ gtk_marshal_NONE__C_CALLBACK,
GTK_TYPE_NONE, 1,
GTK_TYPE_C_CALLBACK);
container_signals[FOCUS] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkContainerClass, focus),
- gtk_container_marshal_signal_3,
+ gtk_marshal_ENUM__ENUM,
GTK_TYPE_DIRECTION_TYPE, 1,
GTK_TYPE_DIRECTION_TYPE);
container_signals[SET_FOCUS_CHILD] =
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkContainerClass, set_focus_child),
- gtk_container_marshal_signal_1,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
gtk_object_class_add_signals (object_class, container_signals, LAST_SIGNAL);
}
}
-static void
-gtk_container_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkContainerSignal1 rfunc;
-
- rfunc = (GtkContainerSignal1) func;
-
- (* rfunc) (object, GTK_VALUE_OBJECT (args[0]), func_data);
-}
-
-static void
-gtk_container_marshal_signal_2 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkContainerSignal2 rfunc;
-
- rfunc = (GtkContainerSignal2) func;
-
- (* rfunc) (object,
- GTK_VALUE_C_CALLBACK(args[0]).func,
- GTK_VALUE_C_CALLBACK(args[0]).func_data,
- func_data);
-}
-
-static void
-gtk_container_marshal_signal_3 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkContainerSignal3 rfunc;
- gint *return_val;
-
- rfunc = (GtkContainerSignal3) func;
- return_val = GTK_RETLOC_ENUM (args[1]);
-
- *return_val = (* rfunc) (object, GTK_VALUE_ENUM(args[0]), func_data);
-}
-
static gint
gtk_container_real_focus (GtkContainer *container,
GtkDirectionType direction)
gboolean update_focus_row);
static GList * gtk_ctree_last_visible (GtkCTree *ctree,
GList *node);
-static void gtk_ctree_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_ctree_marshal_signal_2 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_ctree_marshal_signal_3 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_ctree_marshal_signal_4 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
static gboolean ctree_is_hot_spot (GtkCTree *ctree,
GList *node,
gint row,
return ctree_type;
}
-static void
-gtk_ctree_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkCTreeSignal1 rfunc;
-
- rfunc = (GtkCTreeSignal1) func;
-
- (*rfunc) (object, GTK_VALUE_POINTER (args[0]), GTK_VALUE_INT (args[1]),
- func_data);
-}
-
-static void
-gtk_ctree_marshal_signal_2 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkCTreeSignal2 rfunc;
-
- rfunc = (GtkCTreeSignal2) func;
-
- (*rfunc) (object, GTK_VALUE_POINTER (args[0]), GTK_VALUE_POINTER (args[1]),
- GTK_VALUE_POINTER (args[2]), func_data);
-}
-
-static void
-gtk_ctree_marshal_signal_3 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkCTreeSignal3 rfunc;
-
- rfunc = (GtkCTreeSignal3) func;
-
- (*rfunc) (object, GTK_VALUE_POINTER (args[0]), func_data);
-}
-
-static void
-gtk_ctree_marshal_signal_4 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkCTreeSignal4 rfunc;
-
- rfunc = (GtkCTreeSignal4) func;
-
- (*rfunc) (object, GTK_VALUE_ENUM (args[0]), func_data);
-}
-
static void
gtk_ctree_class_init (GtkCTreeClass *klass)
{
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_select_row),
- gtk_ctree_marshal_signal_1,
+ gtk_marshal_NONE__POINTER_INT,
GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
ctree_signals[TREE_UNSELECT_ROW] =
gtk_signal_new ("tree_unselect_row",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_unselect_row),
- gtk_ctree_marshal_signal_1,
+ gtk_marshal_NONE__POINTER_INT,
GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
ctree_signals[TREE_EXPAND] =
gtk_signal_new ("tree_expand",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_expand),
- gtk_ctree_marshal_signal_3,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
ctree_signals[TREE_COLLAPSE] =
gtk_signal_new ("tree_collapse",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_collapse),
- gtk_ctree_marshal_signal_3,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
ctree_signals[TREE_MOVE] =
gtk_signal_new ("tree_move",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_move),
- gtk_ctree_marshal_signal_2,
+ gtk_marshal_NONE__POINTER_POINTER_POINTER,
GTK_TYPE_NONE, 3, GTK_TYPE_POINTER, GTK_TYPE_POINTER,
GTK_TYPE_POINTER);
ctree_signals[CHANGE_FOCUS_ROW_EXPANSION] =
object_class->type,
GTK_SIGNAL_OFFSET (GtkCTreeClass,
change_focus_row_expansion),
- gtk_ctree_marshal_signal_4,
+ gtk_marshal_NONE__ENUM,
GTK_TYPE_NONE, 1, GTK_TYPE_ENUM);
gtk_object_class_add_signals (object_class, ctree_signals, LAST_SIGNAL);
curve_type_changed_signal =
gtk_signal_new ("curve_type_changed", GTK_RUN_FIRST, object_class->type,
GTK_SIGNAL_OFFSET (GtkCurveClass, curve_type_changed),
- gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+ gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, &curve_type_changed_signal, 1);
object_class->finalize = gtk_curve_finalize;
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkDataClass, disconnect),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, data_signals, LAST_SIGNAL);
static void gtk_editable_real_set_editable (GtkEditable *editable,
gboolean is_editable);
-
-static void gtk_editable_marshal_signal_1 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-static void gtk_editable_marshal_signal_2 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-static void gtk_editable_marshal_signal_3 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
static GtkWidgetClass *parent_class = NULL;
static guint editable_signals[LAST_SIGNAL] = { 0 };
static GdkAtom ctext_atom = GDK_NONE;
static GdkAtom text_atom = GDK_NONE;
static GdkAtom clipboard_atom = GDK_NONE;
-typedef void (*GtkEditableSignal1) (GtkObject * object,
- gchar *arg1,
- gint arg2,
- gint *arg3,
- gpointer data);
-
-typedef void (*GtkEditableSignal2) (GtkObject * object,
- gint arg1,
- gint arg2,
- gpointer data);
-
-typedef void (*GtkEditableSignal3) (GtkObject * object,
- gint arg1,
- gpointer data);
-
GtkType
gtk_editable_get_type (void)
{
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, changed),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
editable_signals[INSERT_TEXT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, insert_text),
- gtk_editable_marshal_signal_1,
+ gtk_marshal_NONE__POINTER_INT_POINTER,
GTK_TYPE_NONE,
3,
GTK_TYPE_STRING,
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, delete_text),
- gtk_editable_marshal_signal_2,
+ gtk_marshal_NONE__INT_INT,
GTK_TYPE_NONE,
2,
GTK_TYPE_INT,
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, activate),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
editable_signals[SET_EDITABLE] =
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, set_editable),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__BOOL,
GTK_TYPE_NONE, 1,
GTK_TYPE_BOOL);
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, move_cursor),
- gtk_editable_marshal_signal_2,
+ gtk_marshal_NONE__INT_INT,
GTK_TYPE_NONE, 2,
GTK_TYPE_INT,
GTK_TYPE_INT);
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, move_word),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, move_page),
- gtk_editable_marshal_signal_2,
+ gtk_marshal_NONE__INT_INT,
GTK_TYPE_NONE, 2,
GTK_TYPE_INT,
GTK_TYPE_INT);
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, move_to_row),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, move_to_column),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, kill_char),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, kill_word),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, kill_line),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, cut_clipboard),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
editable_signals[COPY_CLIPBOARD] =
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, copy_clipboard),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
editable_signals[PASTE_CLIPBOARD] =
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, paste_clipboard),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, editable_signals, LAST_SIGNAL);
gtk_signal_emit (GTK_OBJECT (editable), editable_signals[CHANGED]);
}
-
-static void
-gtk_editable_marshal_signal_1 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkEditableSignal1 rfunc;
-
- rfunc = (GtkEditableSignal1) func;
-
- (*rfunc) (object, GTK_VALUE_STRING (args[0]),
- GTK_VALUE_INT (args[1]),
- GTK_VALUE_POINTER (args[2]),
- func_data);
-}
-
-static void
-gtk_editable_marshal_signal_2 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkEditableSignal2 rfunc;
-
- rfunc = (GtkEditableSignal2) func;
-
- (*rfunc) (object, GTK_VALUE_INT (args[0]),
- GTK_VALUE_INT (args[1]),
- func_data);
-}
-
-static void
-gtk_editable_marshal_signal_3 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkEditableSignal3 rfunc;
-
- rfunc = (GtkEditableSignal3) func;
-
- (*rfunc) (object, GTK_VALUE_INT (args[0]),
- func_data);
-}
SIGNAL_LAST
};
-typedef void (*SignalChildAttached) (GtkObject *object,
- GtkWidget *widget,
- gpointer func_data);
-
static void gtk_handle_box_class_init (GtkHandleBoxClass *klass);
static void gtk_handle_box_init (GtkHandleBox *handle_box);
static void gtk_handle_box_destroy (GtkObject *object);
return handle_box_type;
}
-static void
-gtk_handle_box_marshal_child_attached (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- SignalChildAttached sfunc = (SignalChildAttached) func;
-
- (* sfunc) (object,
- (GtkWidget*) GTK_VALUE_OBJECT (args[0]),
- func_data);
-}
-
static void
gtk_handle_box_class_init (GtkHandleBoxClass *class)
{
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkHandleBoxClass, child_attached),
- gtk_handle_box_marshal_child_attached,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
handle_box_signals[SIGNAL_CHILD_DETACHED] =
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkHandleBoxClass, child_detached),
- gtk_handle_box_marshal_child_attached,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
gtk_object_class_add_signals (object_class, handle_box_signals, SIGNAL_LAST);
#include "gtktable.h"
#include "gtkvbox.h"
-typedef void (*GtkInputDialogSignal1) (GtkObject *object,
- int arg1,
- gpointer data);
-
typedef struct {
gint index;
GtkWidget *entry;
/* Forward declarations */
-static void gtk_input_dialog_marshal_signal1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
static void gtk_input_dialog_class_init (GtkInputDialogClass *klass);
static void gtk_input_dialog_init (GtkInputDialog *inputd);
static GdkDeviceInfo *gtk_input_dialog_get_device_info(guint32 deviceid);
static GtkObjectClass *parent_class = NULL;
static guint input_dialog_signals[LAST_SIGNAL] = { 0 };
-static void
-gtk_input_dialog_marshal_signal1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkInputDialogSignal1 rfunc;
-
- rfunc = (GtkInputDialogSignal1) func;
- (* rfunc) (object, GTK_VALUE_INT(args[0]), func_data);
-}
-
static GdkDeviceInfo *
gtk_input_dialog_get_device_info(guint32 deviceid)
{
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkInputDialogClass, enable_device),
- gtk_input_dialog_marshal_signal1,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1, GTK_TYPE_INT);
input_dialog_signals[DISABLE_DEVICE] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkInputDialogClass, disable_device),
- gtk_input_dialog_marshal_signal1,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1, GTK_TYPE_INT);
gtk_object_class_add_signals (object_class, input_dialog_signals,
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkItemClass, select),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
item_signals[DESELECT] =
gtk_signal_new ("deselect",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkItemClass, deselect),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
item_signals[TOGGLE] =
gtk_signal_new ("toggle",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkItemClass, toggle),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, item_signals, LAST_SIGNAL);
LAST_SIGNAL
};
-
-typedef void (*GtkListSignal) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-
-
static void gtk_list_class_init (GtkListClass *klass);
static void gtk_list_init (GtkList *list);
static void gtk_list_shutdown (GtkObject *object);
static void gtk_real_list_unselect_child (GtkList *list,
GtkWidget *child);
-static void gtk_list_marshal_signal (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
static GtkType gtk_list_child_type (GtkContainer *container);
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkListClass, selection_changed),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
list_signals[SELECT_CHILD] =
gtk_signal_new ("select_child",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkListClass, select_child),
- gtk_list_marshal_signal,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
list_signals[UNSELECT_CHILD] =
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkListClass, unselect_child),
- gtk_list_marshal_signal,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
break;
}
}
-
-
-static void
-gtk_list_marshal_signal (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkListSignal rfunc;
-
- rfunc = (GtkListSignal) func;
-
- (* rfunc) (object, GTK_VALUE_OBJECT (args[0]), func_data);
-}
#include "gtkmarshal.h"
-typedef void (*GtkSignal_NONE__POINTER_POINTER) (GtkObject * object,
- gpointer arg1,
- gpointer arg2,
- gpointer user_data);
+typedef gboolean (*GtkSignal_BOOL__POINTER) (GtkObject * object,
+ gpointer arg1,
+ gpointer user_data);
void
-gtk_marshal_NONE__POINTER_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
+gtk_marshal_BOOL__POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
{
- GtkSignal_NONE__POINTER_POINTER rfunc;
- rfunc = (GtkSignal_NONE__POINTER_POINTER) func;
- (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- GTK_VALUE_POINTER (args[1]),
- func_data);
+ GtkSignal_BOOL__POINTER rfunc;
+ gboolean *return_val;
+ return_val = GTK_RETLOC_BOOL (args[1]);
+ rfunc = (GtkSignal_BOOL__POINTER) func;
+ *return_val = (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ func_data);
+}
+
+typedef gboolean (*GtkSignal_BOOL__NONE) (GtkObject * object,
+ gpointer user_data);
+void
+gtk_marshal_BOOL__NONE (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_BOOL__NONE rfunc;
+ gboolean *return_val;
+ return_val = GTK_RETLOC_BOOL (args[1]);
+ rfunc = (GtkSignal_BOOL__NONE) func;
+ *return_val = (*rfunc) (object,
+ func_data);
+}
+
+typedef gboolean (*GtkSignal_BOOL__POINTER_POINTER_INT_INT) (GtkObject * object,
+ gpointer arg1,
+ gpointer arg2,
+ gint arg3,
+ gint arg4,
+ gpointer user_data);
+void
+gtk_marshal_BOOL__POINTER_POINTER_INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_BOOL__POINTER_POINTER_INT_INT rfunc;
+ gboolean *return_val;
+ return_val = GTK_RETLOC_BOOL (args[4]);
+ rfunc = (GtkSignal_BOOL__POINTER_POINTER_INT_INT) func;
+ *return_val = (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_POINTER (args[1]),
+ GTK_VALUE_INT (args[2]),
+ GTK_VALUE_INT (args[3]),
+ func_data);
+}
+
+typedef gint (*GtkSignal_INT__INT) (GtkObject * object,
+ gint arg1,
+ gpointer user_data);
+void
+gtk_marshal_INT__INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_INT__INT rfunc;
+ gint *return_val;
+ return_val = GTK_RETLOC_INT (args[1]);
+ rfunc = (GtkSignal_INT__INT) func;
+ *return_val = (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ func_data);
+}
+
+typedef gint (*GtkSignal_INT__POINTER) (GtkObject * object,
+ gpointer arg1,
+ gpointer user_data);
+void
+gtk_marshal_INT__POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_INT__POINTER rfunc;
+ gint *return_val;
+ return_val = GTK_RETLOC_INT (args[1]);
+ rfunc = (GtkSignal_INT__POINTER) func;
+ *return_val = (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ func_data);
}
typedef gint (*GtkSignal_INT__POINTER_CHAR_CHAR) (GtkObject * object,
func_data);
}
-typedef gint (*GtkSignal_INT__POINTER) (GtkObject * object,
- gpointer arg1,
- gpointer user_data);
+typedef void (*GtkSignal_NONE__POINTER_POINTER) (GtkObject * object,
+ gpointer arg1,
+ gpointer arg2,
+ gpointer user_data);
void
-gtk_marshal_INT__POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
+gtk_marshal_NONE__POINTER_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
{
- GtkSignal_INT__POINTER rfunc;
- gint *return_val;
- return_val = GTK_RETLOC_INT (args[1]);
- rfunc = (GtkSignal_INT__POINTER) func;
- *return_val = (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- func_data);
+ GtkSignal_NONE__POINTER_POINTER rfunc;
+ rfunc = (GtkSignal_NONE__POINTER_POINTER) func;
+ (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_POINTER (args[1]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT) (GtkObject * object,
+ gint arg1,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT rfunc;
+ rfunc = (GtkSignal_NONE__INT) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT_FLOAT) (GtkObject * object,
+ gint arg1,
+ gfloat arg2,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_FLOAT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_FLOAT rfunc;
+ rfunc = (GtkSignal_NONE__INT_FLOAT) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_FLOAT (args[1]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT_FLOAT_BOOL) (GtkObject * object,
+ gint arg1,
+ gfloat arg2,
+ gboolean arg3,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_FLOAT_BOOL (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_FLOAT_BOOL rfunc;
+ rfunc = (GtkSignal_NONE__INT_FLOAT_BOOL) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_FLOAT (args[1]),
+ GTK_VALUE_BOOL (args[2]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT_INT) (GtkObject * object,
+ gint arg1,
+ gint arg2,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_INT rfunc;
+ rfunc = (GtkSignal_NONE__INT_INT) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_INT (args[1]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT_INT_POINTER) (GtkObject * object,
+ gint arg1,
+ gint arg2,
+ gpointer arg3,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_INT_POINTER rfunc;
+ rfunc = (GtkSignal_NONE__INT_INT_POINTER) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_INT (args[1]),
+ GTK_VALUE_POINTER (args[2]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__NONE) (GtkObject * object,
+ gpointer user_data);
+void
+gtk_marshal_NONE__NONE (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__NONE rfunc;
+ rfunc = (GtkSignal_NONE__NONE) func;
+ (*rfunc) (object,
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__POINTER_INT) (GtkObject * object,
+ gpointer arg1,
+ gint arg2,
+ gpointer user_data);
+void
+gtk_marshal_NONE__POINTER_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__POINTER_INT rfunc;
+ rfunc = (GtkSignal_NONE__POINTER_INT) func;
+ (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_INT (args[1]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__POINTER_POINTER_POINTER) (GtkObject * object,
+ gpointer arg1,
+ gpointer arg2,
+ gpointer arg3,
+ gpointer user_data);
+void
+gtk_marshal_NONE__POINTER_POINTER_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__POINTER_POINTER_POINTER rfunc;
+ rfunc = (GtkSignal_NONE__POINTER_POINTER_POINTER) func;
+ (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_POINTER (args[1]),
+ GTK_VALUE_POINTER (args[2]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__POINTER_INT_INT) (GtkObject * object,
+ gpointer arg1,
+ gint arg2,
+ gint arg3,
+ gpointer user_data);
+void
+gtk_marshal_NONE__POINTER_INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__POINTER_INT_INT rfunc;
+ rfunc = (GtkSignal_NONE__POINTER_INT_INT) func;
+ (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_INT (args[1]),
+ GTK_VALUE_INT (args[2]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__POINTER_INT_POINTER) (GtkObject * object,
+ gpointer arg1,
+ gint arg2,
+ gpointer arg3,
+ gpointer user_data);
+void
+gtk_marshal_NONE__POINTER_INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__POINTER_INT_POINTER rfunc;
+ rfunc = (GtkSignal_NONE__POINTER_INT_POINTER) func;
+ (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_INT (args[1]),
+ GTK_VALUE_POINTER (args[2]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT_POINTER_INT_INT_INT_POINTER) (GtkObject * object,
+ gint arg1,
+ gpointer arg2,
+ gint arg3,
+ gint arg4,
+ gint arg5,
+ gpointer arg6,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_POINTER_INT_INT_INT_POINTER rfunc;
+ rfunc = (GtkSignal_NONE__INT_POINTER_INT_INT_INT_POINTER) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_POINTER (args[1]),
+ GTK_VALUE_INT (args[2]),
+ GTK_VALUE_INT (args[3]),
+ GTK_VALUE_INT (args[4]),
+ GTK_VALUE_POINTER (args[5]),
+ func_data);
}
-typedef void (*GtkSignal_NONE__UINT) (GtkObject * object,
- guint arg1,
+typedef void (*GtkSignal_NONE__INT_POINTER_INT_INT_INT) (GtkObject * object,
+ gint arg1,
+ gpointer arg2,
+ gint arg3,
+ gint arg4,
+ gint arg5,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_POINTER_INT_INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_POINTER_INT_INT_INT rfunc;
+ rfunc = (GtkSignal_NONE__INT_POINTER_INT_INT_INT) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_POINTER (args[1]),
+ GTK_VALUE_INT (args[2]),
+ GTK_VALUE_INT (args[3]),
+ GTK_VALUE_INT (args[4]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__BOOL) (GtkObject * object,
+ gboolean arg1,
gpointer user_data);
void
-gtk_marshal_NONE__UINT (GtkObject * object,
+gtk_marshal_NONE__BOOL (GtkObject * object,
GtkSignalFunc func,
gpointer func_data,
GtkArg * args)
{
- GtkSignal_NONE__UINT rfunc;
- rfunc = (GtkSignal_NONE__UINT) func;
+ GtkSignal_NONE__BOOL rfunc;
+ rfunc = (GtkSignal_NONE__BOOL) func;
(*rfunc) (object,
- GTK_VALUE_UINT (args[0]),
+ GTK_VALUE_BOOL (args[0]),
+ func_data);
+}
+
+typedef gboolean (*GtkSignal_BOOL__POINTER_POINTER_POINTER_POINTER) (GtkObject * object,
+ gpointer arg1,
+ gpointer arg2,
+ gpointer arg3,
+ gpointer arg4,
+ gpointer user_data);
+void
+gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_BOOL__POINTER_POINTER_POINTER_POINTER rfunc;
+ gboolean *return_val;
+ return_val = GTK_RETLOC_BOOL (args[4]);
+ rfunc = (GtkSignal_BOOL__POINTER_POINTER_POINTER_POINTER) func;
+ *return_val = (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_POINTER (args[1]),
+ GTK_VALUE_POINTER (args[2]),
+ GTK_VALUE_POINTER (args[3]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT_POINTER) (GtkObject * object,
+ gint arg1,
+ gpointer arg2,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_POINTER rfunc;
+ rfunc = (GtkSignal_NONE__INT_POINTER) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_POINTER (args[1]),
func_data);
}
#ifndef __GTKMARSHAL_H__
#define __GTKMARSHAL_H__ 1
-#include "gtktypeutils.h"
-#include "gtkobject.h"
+#include <gtk/gtktypeutils.h>
+#include <gtk/gtkobject.h>
-#define gtk_marshal_NONE__POINTER_POINTER gtk_marshal_NONE__POINTER_POINTER
-void gtk_marshal_NONE__POINTER_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
+#ifdef __cplusplus
+extern "C"
+{
+#pragma }
+#endif /* __cplusplus */
-#define gtk_marshal_INT__POINTER_CHAR_CHAR gtk_marshal_INT__POINTER_CHAR_CHAR
-void gtk_marshal_INT__POINTER_CHAR_CHAR (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
+#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE
+
+#define gtk_marshal_BOOL__GDK_EVENT gtk_marshal_BOOL__POINTER
-#define gtk_marshal_NONE__POINTER gtk_marshal_NONE__POINTER
-void gtk_marshal_NONE__POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
+ void gtk_marshal_BOOL__POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
-#define gtk_marshal_INT__POINTER gtk_marshal_INT__POINTER
-void gtk_marshal_INT__POINTER (GtkObject * object,
+ void gtk_marshal_BOOL__NONE (GtkObject * object,
GtkSignalFunc func,
gpointer func_data,
GtkArg * args);
-void gtk_marshal_NONE__UINT (GtkObject * object,
+ void gtk_marshal_BOOL__POINTER_POINTER_INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_ENUM__ENUM gtk_marshal_INT__INT
+
+ void gtk_marshal_INT__INT (GtkObject * object,
GtkSignalFunc func,
gpointer func_data,
GtkArg * args);
+ void gtk_marshal_INT__POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+ void gtk_marshal_INT__POINTER_CHAR_CHAR (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
#define gtk_marshal_NONE__BOXED gtk_marshal_NONE__POINTER
-#endif
+
+ void gtk_marshal_NONE__POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__C_CALLBACK_C_CALLBACK gtk_marshal_NONE__POINTER_POINTER
+
+ void gtk_marshal_NONE__POINTER_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__ENUM gtk_marshal_NONE__INT
+
+ void gtk_marshal_NONE__INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__ENUM_FLOAT gtk_marshal_NONE__INT_FLOAT
+
+ void gtk_marshal_NONE__INT_FLOAT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__ENUM_FLOAT_BOOL gtk_marshal_NONE__INT_FLOAT_BOOL
+
+ void gtk_marshal_NONE__INT_FLOAT_BOOL (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+ void gtk_marshal_NONE__INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+ void gtk_marshal_NONE__INT_INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+ void gtk_marshal_NONE__NONE (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__OBJECT gtk_marshal_NONE__POINTER
+
+ void gtk_marshal_NONE__POINTER_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+ void gtk_marshal_NONE__POINTER_POINTER_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__POINTER_UINT_ENUM gtk_marshal_NONE__POINTER_INT_INT
+
+ void gtk_marshal_NONE__POINTER_INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__STRING gtk_marshal_NONE__POINTER
+
+#define gtk_marshal_NONE__STRING_INT_POINTER gtk_marshal_NONE__POINTER_INT_POINTER
+
+ void gtk_marshal_NONE__POINTER_INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__STYLE gtk_marshal_NONE__POINTER
+
+#define gtk_marshal_NONE__UINT gtk_marshal_NONE__INT
+
+#define gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER
+
+ void gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__POINTER_UINT_UINT gtk_marshal_NONE__POINTER_INT_INT
+
+#define gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM gtk_marshal_NONE__INT_POINTER_INT_INT_INT
+
+ void gtk_marshal_NONE__INT_POINTER_INT_INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__C_CALLBACK gtk_marshal_NONE__POINTER
+
+ void gtk_marshal_NONE__BOOL (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__POINTER_UINT gtk_marshal_NONE__POINTER_INT
+
+#define gtk_marshal_NONE__POINTER_STRING_STRING gtk_marshal_NONE__POINTER_POINTER_POINTER
+
+#define gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER
+
+ void gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__UINT_STRING gtk_marshal_NONE__INT_POINTER
+
+ void gtk_marshal_NONE__INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __GTKMARSHAL_H__ */
-NONE:POINTER,POINTER
+BOOL:GDK_EVENT
+BOOL:NONE
+BOOL:POINTER
+BOOL:POINTER,POINTER,INT,INT
+BOOL:POINTER,STRING,STRING,POINTER
+ENUM:ENUM
+INT:POINTER
INT:POINTER,CHAR,CHAR
+NONE:BOOL
+NONE:BOXED
+NONE:C_CALLBACK
+NONE:C_CALLBACK,C_CALLBACK
+NONE:ENUM
+NONE:ENUM,FLOAT
+NONE:ENUM,FLOAT,BOOL
+NONE:INT
+NONE:INT,INT
+NONE:INT,INT,POINTER
+NONE:NONE
+NONE:OBJECT
NONE:POINTER
-INT:POINTER
+NONE:POINTER,INT
+NONE:POINTER,POINTER
+NONE:POINTER,POINTER,POINTER
+NONE:POINTER,STRING,STRING
+NONE:POINTER,UINT
+NONE:POINTER,UINT,ENUM
+NONE:POINTER,UINT,UINT
+NONE:STRING
+NONE:STRING,INT,POINTER
+NONE:STYLE
NONE:UINT
-NONE:BOXED
-BOOL:POINTER
\ No newline at end of file
+NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
+NONE:UINT,POINTER,UINT,UINT,ENUM
+NONE:UINT,STRING
-NONE:POINTER,POINTER
+BOOL:GDK_EVENT
+BOOL:NONE
+BOOL:POINTER
+BOOL:POINTER,POINTER,INT,INT
+BOOL:POINTER,STRING,STRING,POINTER
+ENUM:ENUM
+INT:POINTER
INT:POINTER,CHAR,CHAR
+NONE:BOOL
+NONE:BOXED
+NONE:C_CALLBACK
+NONE:C_CALLBACK,C_CALLBACK
+NONE:ENUM
+NONE:ENUM,FLOAT
+NONE:ENUM,FLOAT,BOOL
+NONE:INT
+NONE:INT,INT
+NONE:INT,INT,POINTER
+NONE:NONE
+NONE:OBJECT
NONE:POINTER
-INT:POINTER
+NONE:POINTER,INT
+NONE:POINTER,POINTER
+NONE:POINTER,POINTER,POINTER
+NONE:POINTER,STRING,STRING
+NONE:POINTER,UINT
+NONE:POINTER,UINT,ENUM
+NONE:POINTER,UINT,UINT
+NONE:STRING
+NONE:STRING,INT,POINTER
+NONE:STYLE
NONE:UINT
-NONE:BOXED
-BOOL:POINTER
\ No newline at end of file
+NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
+NONE:UINT,POINTER,UINT,UINT,ENUM
+NONE:UINT,STRING
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkMenuItemClass, activate),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, menu_item_signals, LAST_SIGNAL);
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkMenuShellClass, deactivate),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
menu_shell_signals[SELECTION_DONE] =
gtk_signal_new ("selection-done",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkMenuShellClass, selection_done),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, menu_shell_signals, LAST_SIGNAL);
CHILD_ARG_POSITION
};
-typedef void (*GtkNotebookSignal) (GtkObject *object,
- GtkNotebookPage *arg1,
- gint arg2,
- gpointer data);
-
static void gtk_notebook_class_init (GtkNotebookClass *klass);
static void gtk_notebook_init (GtkNotebook *notebook);
static void gtk_notebook_set_arg (GtkObject *object,
static void gtk_real_notebook_switch_page (GtkNotebook *notebook,
GtkNotebookPage *page,
guint page_num);
-static void gtk_notebook_marshal_signal (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
static void gtk_notebook_menu_switch_page (GtkWidget *widget,
GtkNotebookPage *page);
static void gtk_notebook_update_labels (GtkNotebook *notebook,
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkNotebookClass, switch_page),
- gtk_notebook_marshal_signal,
+ gtk_marshal_NONE__POINTER_UINT,
GTK_TYPE_NONE, 2,
GTK_TYPE_POINTER,
GTK_TYPE_UINT);
page_num);
}
-static void
-gtk_notebook_marshal_signal (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkNotebookSignal rfunc;
-
- rfunc = (GtkNotebookSignal) func;
-
- (* rfunc) (object, GTK_VALUE_POINTER (args[0]), GTK_VALUE_INT (args[1]),
- func_data);
-}
-
static gint
gtk_notebook_focus (GtkContainer *container,
GtkDirectionType direction)
GTK_RUN_LAST,
class->type,
GTK_SIGNAL_OFFSET (GtkObjectClass, destroy),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (class, object_signals, LAST_SIGNAL);
}
}
+/* Work around the
+ '#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE'
+ in gtkmarshal.h
+
+ This is here to provide some sort of basic backwards binary
+ compatibility. It is not listed in gtksignal.h in order to make
+ sure people recompiling things see warnings and make changes as needed.
+ -ECL
+*/
+#undef gtk_signal_default_marshaller
void
gtk_signal_default_marshaller (GtkObject *object,
GtkSignalFunc func,
(* rfunc) (object, func_data);
}
+#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE
void
gtk_signal_set_funcs (GtkSignalMarshal marshal_func,
SIGNAL_LAST
};
-typedef void (*SignalTextP) (GtkObject *object,
- guint context_id,
- const gchar *text,
- gpointer func_data);
-
static void gtk_statusbar_class_init (GtkStatusbarClass *class);
static void gtk_statusbar_init (GtkStatusbar *statusbar);
static void gtk_statusbar_destroy (GtkObject *object);
return statusbar_type;
}
-static void
-gtk_statusbar_marshal_text_p (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- SignalTextP sfunc = (SignalTextP) func;
-
- (* sfunc) (object,
- GTK_VALUE_UINT (args[0]),
- GTK_VALUE_STRING (args[1]),
- func_data);
-}
-
static void
gtk_statusbar_class_init (GtkStatusbarClass *class)
{
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkStatusbarClass, text_pushed),
- gtk_statusbar_marshal_text_p,
+ gtk_marshal_NONE__UINT_STRING,
GTK_TYPE_NONE, 2,
GTK_TYPE_UINT,
GTK_TYPE_STRING);
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkStatusbarClass, text_popped),
- gtk_statusbar_marshal_text_p,
+ gtk_marshal_NONE__UINT_STRING,
GTK_TYPE_NONE, 2,
GTK_TYPE_UINT,
GTK_TYPE_STRING);
SIGNAL_WIDGET_SELECTED,
SIGNAL_LAST
};
-typedef void (*SignalWidgetEntered) (GtkObject *object,
- GtkWidget *widget,
- const gchar *tip_text,
- const gchar *tip_private,
- gpointer func_data);
-typedef gint (*SignalWidgetSelected) (GtkObject *object,
- GtkWidget *widget,
- const gchar *tip_text,
- const gchar *tip_private,
- GdkEventButton *event,
- gpointer func_data);
-
/* --- prototypes --- */
static void gtk_tips_query_class_init (GtkTipsQueryClass *class);
return tips_query_type;
}
-static void
-gtk_tips_query_marshal_widget_entered (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- SignalWidgetEntered sfunc = (SignalWidgetEntered) func;
-
- (* sfunc) (object,
- (GtkWidget*) GTK_VALUE_OBJECT (args[0]),
- GTK_VALUE_STRING (args[1]),
- GTK_VALUE_STRING (args[2]),
- func_data);
-}
-
-static void
-gtk_tips_query_marshal_widget_selected (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- gint *return_val;
-
- SignalWidgetSelected sfunc = (SignalWidgetSelected) func;
- return_val = GTK_RETLOC_BOOL (args[4]);
-
- *return_val = (* sfunc) (object,
- (GtkWidget*) GTK_VALUE_OBJECT (args[0]),
- GTK_VALUE_STRING (args[1]),
- GTK_VALUE_STRING (args[2]),
- GTK_VALUE_BOXED (args[3]),
- func_data);
-}
-
static void
gtk_tips_query_class_init (GtkTipsQueryClass *class)
{
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, start_query),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
tips_query_signals[SIGNAL_STOP_QUERY] =
gtk_signal_new ("stop_query",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, stop_query),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
tips_query_signals[SIGNAL_WIDGET_ENTERED] =
gtk_signal_new ("widget_entered",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, widget_entered),
- gtk_tips_query_marshal_widget_entered,
+ gtk_marshal_NONE__POINTER_STRING_STRING,
GTK_TYPE_NONE, 3,
GTK_TYPE_WIDGET,
GTK_TYPE_STRING,
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, widget_selected),
- gtk_tips_query_marshal_widget_selected,
+ gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER,
GTK_TYPE_BOOL, 4,
GTK_TYPE_WIDGET,
GTK_TYPE_STRING,
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkToggleButtonClass, toggled),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, toggle_button_signals, LAST_SIGNAL);
LAST_SIGNAL
};
-typedef void (*GtkToolbarSignal1) (GtkObject *object,
- gint arg1,
- gpointer data);
-
-static void gtk_toolbar_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-
-
static void gtk_toolbar_class_init (GtkToolbarClass *class);
static void gtk_toolbar_init (GtkToolbar *toolbar);
static void gtk_toolbar_destroy (GtkObject *object);
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkToolbarClass, orientation_changed),
- gtk_toolbar_marshal_signal_1,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
toolbar_signals[STYLE_CHANGED] =
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkToolbarClass, style_changed),
- gtk_toolbar_marshal_signal_1,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
return toolbar->relief;
}
-static void
-gtk_toolbar_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkToolbarSignal1 rfunc;
-
- rfunc = (GtkToolbarSignal1) func;
-
- (*rfunc) (object, GTK_VALUE_ENUM (args[0]), func_data);
-}
-
static void
gtk_real_toolbar_orientation_changed (GtkToolbar *toolbar,
GtkOrientation orientation)
LAST_SIGNAL
};
-typedef void (*GtkTreeSignal) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-
-
static void gtk_tree_class_init (GtkTreeClass *klass);
static void gtk_tree_init (GtkTree *tree);
static void gtk_tree_destroy (GtkObject *object);
static void gtk_real_tree_unselect_child (GtkTree *tree,
GtkWidget *child);
-static void gtk_tree_marshal_signal (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
static GtkType gtk_tree_child_type (GtkContainer *container);
static GtkContainerClass *parent_class = NULL;
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTreeClass, selection_changed),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
tree_signals[SELECT_CHILD] =
gtk_signal_new ("select_child",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTreeClass, select_child),
- gtk_tree_marshal_signal,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
tree_signals[UNSELECT_CHILD] =
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTreeClass, unselect_child),
- gtk_tree_marshal_signal,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
}
}
-static void
-gtk_tree_marshal_signal (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkTreeSignal rfunc;
-
- rfunc = (GtkTreeSignal) func;
-
- (* rfunc) (object, GTK_VALUE_OBJECT (args[0]), func_data);
-}
-
static gint
gtk_tree_motion_notify (GtkWidget *widget,
GdkEventMotion *event)
static GList *pixmaps = NULL;
-typedef void (*GtkTreeItemSignal) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-
static void gtk_tree_item_class_init (GtkTreeItemClass *klass);
static void gtk_tree_item_init (GtkTreeItem *tree_item);
static void gtk_tree_item_realize (GtkWidget *widget);
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTreeItemClass, expand),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
tree_item_signals[COLLAPSE_TREE] =
gtk_signal_new ("collapse",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTreeItemClass, collapse),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, tree_item_signals, LAST_SIGNAL);
ARG_EXTENSION_EVENTS
};
-
-typedef void (*GtkWidgetSignal1) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-typedef gint (*GtkWidgetSignal2) (GtkObject *object,
- gpointer arg1,
- gchar arg2,
- gchar arg3,
- gpointer data);
-typedef void (*GtkWidgetSignal3) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-typedef gint (*GtkWidgetSignal4) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-typedef void (*GtkWidgetSignal5) (GtkObject *object,
- guint arg1,
- gpointer data);
-typedef void (*GtkWidgetSignal6) (GtkObject *object,
- GtkObject *arg1,
- gpointer data);
-typedef void (*GtkWidgetSignal7) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-
typedef struct _GtkStateData GtkStateData;
struct _GtkStateData
guint parent_sensitive : 1;
};
-
-static void gtk_widget_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_widget_marshal_signal_4 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_widget_marshal_signal_5 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_widget_marshal_signal_6 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_widget_marshal_signal_7 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-
static void gtk_widget_class_init (GtkWidgetClass *klass);
static void gtk_widget_init (GtkWidget *widget);
static void gtk_widget_set_arg (GtkObject *object,
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, show),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[HIDE] =
gtk_signal_new ("hide",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, hide),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[MAP] =
gtk_signal_new ("map",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, map),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[UNMAP] =
gtk_signal_new ("unmap",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, unmap),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[REALIZE] =
gtk_signal_new ("realize",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, realize),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[UNREALIZE] =
gtk_signal_new ("unrealize",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, unrealize),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[DRAW] =
gtk_signal_new ("draw",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, draw),
- gtk_widget_marshal_signal_1,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_POINTER);
widget_signals[DRAW_FOCUS] =
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, draw_focus),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[DRAW_DEFAULT] =
gtk_signal_new ("draw_default",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, draw_default),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[SIZE_REQUEST] =
gtk_signal_new ("size_request",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, size_request),
- gtk_widget_marshal_signal_1,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_POINTER);
widget_signals[SIZE_ALLOCATE] =
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, size_allocate),
- gtk_widget_marshal_signal_1,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_POINTER);
widget_signals[STATE_CHANGED] =
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, state_changed),
- gtk_widget_marshal_signal_5,
+ gtk_marshal_NONE__UINT,
GTK_TYPE_NONE, 1,
GTK_TYPE_STATE_TYPE);
widget_signals[PARENT_SET] =
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, parent_set),
- gtk_widget_marshal_signal_6,
+ gtk_marshal_NONE__OBJECT,
GTK_TYPE_NONE, 1,
GTK_TYPE_OBJECT);
widget_signals[STYLE_SET] =
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, style_set),
- gtk_widget_marshal_signal_7,
+ gtk_marshal_NONE__STYLE,
GTK_TYPE_NONE, 1,
GTK_TYPE_STYLE);
widget_signals[ADD_ACCELERATOR] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[BUTTON_PRESS_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, button_press_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[BUTTON_RELEASE_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, button_release_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[MOTION_NOTIFY_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, motion_notify_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DELETE_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, delete_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DESTROY_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, destroy_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[EXPOSE_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, expose_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[KEY_PRESS_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, key_press_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[KEY_RELEASE_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, key_release_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[ENTER_NOTIFY_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, enter_notify_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[LEAVE_NOTIFY_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, leave_notify_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[CONFIGURE_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, configure_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[FOCUS_IN_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, focus_in_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[FOCUS_OUT_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, focus_out_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[MAP_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, map_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[UNMAP_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, unmap_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[PROPERTY_NOTIFY_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, property_notify_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[SELECTION_CLEAR_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_clear_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[SELECTION_REQUEST_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_request_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[SELECTION_NOTIFY_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_notify_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[SELECTION_RECEIVED] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_received),
- gtk_widget_marshal_signal_1,
+ gtk_marshal_NONE__ENUM,
GTK_TYPE_NONE, 1,
GTK_TYPE_SELECTION_DATA);
widget_signals[PROXIMITY_IN_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, proximity_in_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[PROXIMITY_OUT_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, proximity_out_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DRAG_BEGIN_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_begin_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DRAG_REQUEST_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_request_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DRAG_END_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_end_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DROP_ENTER_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, drop_enter_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DROP_LEAVE_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, drop_leave_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DROP_DATA_AVAILABLE_EVENT] =
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass,
drop_data_available_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[VISIBILITY_NOTIFY_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, visibility_notify_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[CLIENT_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, client_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[NO_EXPOSE_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, no_expose_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[OTHER_EVENT] =
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, other_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DEBUG_MSG] =
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, debug_msg),
- gtk_widget_marshal_signal_1,
+ gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1,
GTK_TYPE_STRING);
return default_visual;
}
-/*****************************************
- * gtk_widget_marshal_signal_1:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkWidgetSignal1 rfunc;
-
- rfunc = (GtkWidgetSignal1) func;
-
- (* rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- func_data);
-}
-
-/*****************************************
- * gtk_widget_marshal_signal_4:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_4 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkWidgetSignal4 rfunc;
- gint *return_val;
-
- rfunc = (GtkWidgetSignal4) func;
- return_val = GTK_RETLOC_BOOL (args[1]);
-
- *return_val = (* rfunc) (object,
- GTK_VALUE_BOXED (args[0]),
- func_data);
-}
-
-/*****************************************
- * gtk_widget_marshal_signal_5:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_5 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkWidgetSignal5 rfunc;
-
- rfunc = (GtkWidgetSignal5) func;
-
- (* rfunc) (object,
- GTK_VALUE_UINT (args[0]),
- func_data);
-}
-
-/*****************************************
- * gtk_widget_marshal_signal_6:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_6 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkWidgetSignal6 rfunc;
-
- rfunc = (GtkWidgetSignal6) func;
-
- (* rfunc) (object,
- GTK_VALUE_OBJECT (args[0]),
- func_data);
-}
-
-/*****************************************
- * gtk_widget_marshal_signal_7:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_7 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkWidgetSignal7 rfunc;
-
- rfunc = (GtkWidgetSignal7) func;
-
- (* rfunc) (object,
- GTK_VALUE_BOXED (args[0]),
- func_data);
-}
-
static void
gtk_widget_shutdown (GtkObject *object)
{
ARG_WIN_POS
};
-typedef gint (*GtkWindowSignal1) (GtkObject *object,
- gpointer arg1,
- gpointer arg2,
- gint arg3,
- gint arg4,
- gpointer data);
-typedef void (*GtkWindowSignal2) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-
-static void gtk_window_marshal_signal_2 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
static void gtk_window_class_init (GtkWindowClass *klass);
static void gtk_window_init (GtkWindow *window);
static void gtk_window_set_arg (GtkObject *object,
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWindowClass, set_focus),
- gtk_window_marshal_signal_2,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_POINTER);
return FALSE;
}
-static void
-gtk_window_marshal_signal_2 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkWindowSignal2 rfunc;
-
- rfunc = (GtkWindowSignal2) func;
-
- (* rfunc) (object, GTK_VALUE_POINTER (args[0]), func_data);
-}
-
static void
gtk_window_shutdown (GtkObject *object)
{
projects / gtk4.git / commitdiff